diff --git a/src/macros.s b/src/macros.s
index 96b8dc5..2246ea5 100644
--- a/src/macros.s
+++ b/src/macros.s
@@ -71,11 +71,11 @@ PUTF	.MACRO
 	.ENDM
 
 ; Overwrites A and Y
-HLIN	.MACRO	x1,x2,y
+HLIN	.MACRO	x1,x2,y1
 	ldy	x1			;Leftmost X coordinate
 	lda	x2
 	sta	H2			;Rightmost X coordinate
-	lda	y			;Y coordinate
+	lda	y1			;Y coordinate
 	jsr	HLINE
 	.ENDM
 
diff --git a/src/rnd.s b/src/rnd.s
index 3c7eaab..d111a06 100644
--- a/src/rnd.s
+++ b/src/rnd.s
@@ -4,7 +4,7 @@
 ;
 ;**************************
 
-	.code
+        .code
 
 	.include    "symbols.s"
 	.include    "macros.s"
@@ -99,4 +99,7 @@ setRandomColor
 	jsr	SETCOLR			;Set the color
 	rts
 
-x2	.db	0
\ No newline at end of file
+        .data
+
+x2	.byte	0
+