diff --git a/src/kits/app/Handler.cpp b/src/kits/app/Handler.cpp
index ac87255d56..8c9b6e4872 100644
--- a/src/kits/app/Handler.cpp
+++ b/src/kits/app/Handler.cpp
@@ -135,7 +135,7 @@
 #include <PropertyInfo.h>
 
 // Project Includes ------------------------------------------------------------
-#include "TokenSpace.h"
+#include <TokenSpace.h>
 
 // Local Includes --------------------------------------------------------------
 
@@ -668,7 +668,7 @@ BMessage: what =  (0x0, or 0)
 			scripting docs are so bloody horrible.  The corresponding
 			property_info array is declared in the globals section.
  */
-	status_t err;
+	status_t err = B_OK;
 	if (!data)
 	{
 		err = B_BAD_VALUE;
diff --git a/src/kits/app/Invoker.cpp b/src/kits/app/Invoker.cpp
index 837fbb9e31..ec08111c09 100644
--- a/src/kits/app/Invoker.cpp
+++ b/src/kits/app/Invoker.cpp
@@ -19,7 +19,7 @@
 //	FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 //	DEALINGS IN THE SOFTWARE.
 //
-//	File Name:		Control.cpp
+//	File Name:		Invoker.cpp
 //	Author:			Marc Flerackers (mflerackers@androme.be)
 //	Description:	BInvoker class defines a protocol for objects that
 //					post messages to a "target".
@@ -28,7 +28,7 @@
 // Standard Includes -----------------------------------------------------------
 
 // System Includes -------------------------------------------------------------
-#include "Invoker.h"
+#include <Invoker.h>
 #include <Errors.h>
 
 // Project Includes ------------------------------------------------------------