diff --git a/cgi.d b/cgi.d
index 7a732bb..6682338 100644
--- a/cgi.d
+++ b/cgi.d
@@ -981,7 +981,7 @@ class Cgi {
 	immutable(string[string]) get;
 	immutable(string[string]) post;
 	immutable(string[string]) cookies;
-	immutable(UploadedFile)[string] files;
+	immutable(UploadedFile[string]) files;
 
 	// Use these if you expect multiple items submitted with the same name. btw, assert(get[name] is getArray[name][$-1); should pass. Same for post and cookies.
 	// the order of the arrays is the order the data arrives
diff --git a/dom.d b/dom.d
index 21f7099..1ea0e67 100644
--- a/dom.d
+++ b/dom.d
@@ -2399,7 +2399,7 @@ class Document {
 				// found something in either branch...
 				if(idx != -1) {
 					// read till a quote or about 12 chars, whichever comes first...
-					int end = idx;
+					auto end = idx;
 					while(end < dataAsBytes.length && dataAsBytes[end] != '"' && end - idx < 12)
 						end++;
 
@@ -4018,7 +4018,7 @@ class StyleSheet {
 }
 
 // unbelievable.
-int indexOfBytes(immutable(ubyte)[] haystack, immutable(ubyte)[] needle) {
+sizediff_t indexOfBytes(immutable(ubyte)[] haystack, immutable(ubyte)[] needle) {
 	auto found = std.algorithm.find(haystack, needle);
 	if(found.length == 0)
 		return -1;