diff --git a/Makefile b/Makefile
index e3c4a8f..889fbd3 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ INCLUDES	:=	include
 #---------------------------------------------------------------------------------
 # options for code generation
 #---------------------------------------------------------------------------------
-ARCH	:=	-march=armv6k -mtune=mpcore -mfloat-abi=softfp
+ARCH	:=	-march=armv6k -mtune=mpcore -mfloat-abi=hard
 
 CFLAGS	:=	-g -Wall -O2 -mword-relocations \
 			-fomit-frame-pointer -ffast-math \
diff --git a/source/uniforms.c b/source/uniforms.c
index 3afea6b..ac06c24 100644
--- a/source/uniforms.c
+++ b/source/uniforms.c
@@ -34,7 +34,7 @@ void C3D_UpdateUniforms(void)
 		*/
 
 		// Upload the uniforms
-		GPU_SetUniform(i, (u32*)&C3D_FVUnif[i], j-i);
+		GPU_SetFloatUniform(GPU_VERTEX_SHADER, i, (u32*)&C3D_FVUnif[i], j-i);
 
 		// Clear the dirty flag
 		int k;