diff --git a/GL/draw.c b/GL/draw.c
index 8ba4c55..3c037d9 100644
--- a/GL/draw.c
+++ b/GL/draw.c
@@ -147,9 +147,9 @@ static void _readVertexData1i3f(const GLubyte* in, GLubyte* out) {
 
     input.value = *((const GLint*) in);
 
-    output[0] = (2.0f * (float) input.bits.x + 1.0f) * MULTIPLIER;
-    output[1] = (2.0f * (float) input.bits.y + 1.0f) * MULTIPLIER;
-    output[2] = (2.0f * (float) input.bits.z + 1.0f) * MULTIPLIER;
+    output[0] = (MATH_fmac(2.0f, (float) input.bits.x, 1.0f)) * MULTIPLIER;
+    output[1] = (MATH_fmac(2.0f, (float) input.bits.y, 1.0f)) * MULTIPLIER;
+    output[2] = (MATH_fmac(2.0f, (float) input.bits.z, 1.0f)) * MULTIPLIER;
 }
 
 static void _readVertexData3us3f(const GLubyte* in, GLubyte* out) {
@@ -283,10 +283,7 @@ static void _readVertexData3ubARGB(const GLubyte* input, GLubyte* output) {
 }
 
 static void _readVertexData4ubRevARGB(const GLubyte* input, GLubyte* output) {
-    output[B8IDX] = input[0];
-    output[G8IDX] = input[1];
-    output[R8IDX] = input[2];
-    output[A8IDX] = input[3];
+    argbcpy(output, input);
 }
 
 static void _readVertexData4fRevARGB(const GLubyte* in, GLubyte* output) {