diff --git a/src/app/color.cpp b/src/app/color.cpp
index 2cb0b9e70..d077b716e 100644
--- a/src/app/color.cpp
+++ b/src/app/color.cpp
@@ -86,7 +86,7 @@ Color Color::fromIndex(int index)
 // static
 Color Color::fromImage(PixelFormat pixelFormat, color_t c)
 {
-  Color color = Color::fromMask();
+  Color color = app::Color::fromMask();
 
   switch (pixelFormat) {
 
@@ -124,7 +124,7 @@ Color Color::fromImageGetPixel(Image *image, int x, int y)
 // static
 Color Color::fromString(const std::string& str)
 {
-  Color color = Color::fromMask();
+  Color color = app::Color::fromMask();
 
   if (str != "mask") {
     if (str.find("rgb{") == 0 ||
diff --git a/src/raster/algofill.cpp b/src/raster/algofill.cpp
index 96bbe018f..c27292dc2 100644
--- a/src/raster/algofill.cpp
+++ b/src/raster/algofill.cpp
@@ -93,6 +93,7 @@ template<typename ImageTraits>
 static inline bool color_equal(color_t c1, color_t c2, int tolerance)
 {
   static_assert(false && sizeof(ImageTraits), "Invalid color comparison");
+  return false;
 }
 
 template<>
diff --git a/src/raster/conversion_alleg.cpp b/src/raster/conversion_alleg.cpp
index e2301d47d..d1fb6798c 100644
--- a/src/raster/conversion_alleg.cpp
+++ b/src/raster/conversion_alleg.cpp
@@ -39,6 +39,7 @@ namespace {
 template<typename ImageTraits, int color_depth>
 int convert_color_to_allegro(color_t color, const Palette* palette) {
   static_assert(false && sizeof(ImageTraits), "Invalid color conversion");
+  return 0;
 }
 
 template<>
diff --git a/src/raster/conversion_she.cpp b/src/raster/conversion_she.cpp
index 3b95b28a3..d106f058d 100644
--- a/src/raster/conversion_she.cpp
+++ b/src/raster/conversion_she.cpp
@@ -42,6 +42,7 @@ namespace {
 template<typename ImageTraits, she::SurfaceFormat format>
 uint32_t convert_color_to_surface(color_t color, const Palette* palette, const she::SurfaceFormatData* fd) {
   static_assert(false && sizeof(ImageTraits), "Invalid color conversion");
+  return 0;
 }
 
 template<>