diff --git a/cgi.d b/cgi.d
index 000b4a4..d9c693a 100644
--- a/cgi.d
+++ b/cgi.d
@@ -10799,7 +10799,7 @@ auto serveStaticFile(string urlPrefix, string filename = null, string contentTyp
 // man 2 sendfile
 	assert(urlPrefix[0] == '/');
 	if(filename is null)
-		filename = urlPrefix[1 .. $];
+		filename = decodeComponent(urlPrefix[1 .. $]); // FIXME is this actually correct?
 	if(contentType is null) {
 		contentType = contentTypeFromFileExtension(filename);
 	}
@@ -10881,7 +10881,7 @@ auto serveStaticFileDirectory(string urlPrefix, string directory = null) {
 	assert(directory[$-1] == '/');
 
 	static bool internalHandler(string urlPrefix, Cgi cgi, Object presenter, DispatcherDetails details) {
-		auto file = cgi.pathInfo[urlPrefix.length .. $];
+		auto file = decodeComponent(cgi.pathInfo[urlPrefix.length .. $]); // FIXME: is this actually correct
 		if(file.indexOf("/") != -1 || file.indexOf("\\") != -1)
 			return false;
 
diff --git a/joystick.d b/joystick.d
index f73f1bb..9d183cd 100644
--- a/joystick.d
+++ b/joystick.d
@@ -199,7 +199,9 @@ version(linux) {
 					break;
 				else assert(0); // , to!string(fd) ~ " " ~ to!string(errno));
 			}
-			assert(r == event.sizeof);
+			if(r != event.sizeof)
+				throw new Exception("Read something weird off the joystick event fd");
+				//import std.stdio; writeln(event);
 
 			ptrdiff_t player = -1;
 			foreach(i, f; joystickFds)
@@ -230,6 +232,7 @@ version(linux) {
 			}
 			if(event.type & JS_EVENT_BUTTON) {
 				joystickState[player].buttons[event.number] = event.value ? 255 : 0;
+				//writeln(player, " ", event.number, " ", event.value, " ", joystickState[player].buttons[event.number]);//, " != ", event.value ? 255 : 0);
 			}
 		}
 	}
diff --git a/webview.d b/webview.d
index 8ee11f3..36602f2 100644
--- a/webview.d
+++ b/webview.d
@@ -109,6 +109,10 @@ struct RC(T) {
 		object = null;
 	}
 
+	bool opCast(T:bool)() nothrow {
+		return inner !is null;
+	}
+
 	void opAssign(T obj) {
 		obj.AddRef();
 		if(object)