diff --git a/headers/private/servers/app/LayerData.h b/headers/private/servers/app/LayerData.h
index 66cd8177c2..505fc77007 100644
--- a/headers/private/servers/app/LayerData.h
+++ b/headers/private/servers/app/LayerData.h
@@ -37,7 +37,8 @@ public:
 			alphaFncMode	= B_ALPHA_OVERLAY;
 			scale			= 1.0;
 			fontAliasing	= true;
-			font			= *(fontserver->GetSystemPlain());
+			if(fontserver)
+				font		= *(fontserver->GetSystemPlain());
 			
 			clippReg		= NULL;
 		
diff --git a/headers/private/servers/app/RGBColor.h b/headers/private/servers/app/RGBColor.h
index 3a18d58718..896584b578 100644
--- a/headers/private/servers/app/RGBColor.h
+++ b/headers/private/servers/app/RGBColor.h
@@ -51,8 +51,8 @@ public:
 	
 	void PrintToStream(void) const;
 	
-	uint8 GetColor8(void) const;
-	uint16 GetColor16(void) const;
+	uint8 GetColor8(void);
+	uint16 GetColor16(void);
 	rgb_color GetColor32(void) const;
 	
 	void SetColor(uint8 r, uint8 g, uint8 b, uint8 a=255);
@@ -72,6 +72,7 @@ protected:
 	rgb_color color32;
 	uint16 color16;
 	uint8 color8;
+	bool update8,update16;
 };
 
 #endif