diff --git a/CMakeLists.txt b/CMakeLists.txt
index ce1b438e4e2a5659f2166b178585128989816063..f60dd1cd25bceed84ca19d424e9d1d0126a3cee6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -328,7 +328,7 @@ if (WIN32) # TODO(nick) Should do based upon compiler (VS)
 	set(OS_LIBS "")
 else()
 	add_definitions(-DUNIX)
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -msse3 -Werror=return-type")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -msse3 -Werror")
 	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -pg -Wall")
 	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -Wall -mfpmath=sse")
 	set(OS_LIBS "dl")
diff --git a/applications/gui/src/frameset_mgr.cpp b/applications/gui/src/frameset_mgr.cpp
index 70a0b226fbe3ceb427b6303e30a523da84bc6661..479f224d95ca18a05667f4a9e4c037131703fb55 100644
--- a/applications/gui/src/frameset_mgr.cpp
+++ b/applications/gui/src/frameset_mgr.cpp
@@ -4,6 +4,6 @@
 static int frameset_counter = 0;
 
 int ftl::gui::mapToFrameset(const std::string &uri) {
-    ftl::URI u(uri);
+    //ftl::URI u(uri);
     return frameset_counter++;
 }
diff --git a/components/rgbd-sources/include/ftl/rgbd/camera.hpp b/components/rgbd-sources/include/ftl/rgbd/camera.hpp
index 2abcf8f8755d096d4e099e4911204e3600158367..8006414d5c1b3c190dbc982f057f9afe5437c6e0 100644
--- a/components/rgbd-sources/include/ftl/rgbd/camera.hpp
+++ b/components/rgbd-sources/include/ftl/rgbd/camera.hpp
@@ -40,17 +40,17 @@ struct __align__(16) Camera {
 	/**
 	 * Convert screen plus depth into camera coordinates.
 	 */
-	__device__ float3 screenToCam(int ux, int uy, float depth) const; 
+	__host__ __device__ float3 screenToCam(int ux, int uy, float depth) const; 
 
 	/**
 	 * Convert screen plus depth into camera coordinates.
 	 */
-	__device__ float3 screenToCam(uint ux, uint uy, float depth) const; 
+	__host__ __device__ float3 screenToCam(uint ux, uint uy, float depth) const; 
 
 	/**
 	 * Convert screen plus depth into camera coordinates.
 	 */
-	__device__ float3 screenToCam(float ux, float uy, float depth) const;
+	__host__ __device__ float3 screenToCam(float ux, float uy, float depth) const;
 
 	#ifndef __CUDACC__