diff --git a/src/glstate.h b/src/glstate.h
index 963cc9f..2992dc6 100644
--- a/src/glstate.h
+++ b/src/glstate.h
@@ -23,7 +23,8 @@
 #define GLSTATE_H
 
 #include "etc.h"
-#include <QStack>
+
+#include <stack>
 
 template<typename T>
 struct GLProperty
@@ -35,7 +36,7 @@ struct GLProperty
 	}
 
 	void push() { stack.push(current); }
-	void pop()  { set(stack.pop()); }
+	void pop()  { set(stack.top()); stack.pop(); }
 	T &get()    { return current; }
 	void set(const T &value)
 	{
@@ -55,7 +56,7 @@ private:
 	virtual void apply(const T &value) = 0;
 
 	T current;
-	QStack<T> stack;
+	std::stack<T> stack;
 };
 
 // Not needed
diff --git a/src/quadarray.h b/src/quadarray.h
index 8ce0071..42c0c81 100644
--- a/src/quadarray.h
+++ b/src/quadarray.h
@@ -89,7 +89,7 @@ struct ColorQuadArray
 		shState->ensureQuadIBO(quadCount);
 	}
 
-	void draw(uint offset, uint count)
+	void draw(size_t offset, size_t count)
 	{
 		VAO::bind(vao);