diff --git a/src/main/fragment/mos6502-common/_stackpushptr_=vwuc1.asm b/src/main/fragment/mos6502-common/_stackpushptr_=vwuc1.asm
new file mode 100644
index 000000000..aea37787e
--- /dev/null
+++ b/src/main/fragment/mos6502-common/_stackpushptr_=vwuc1.asm
@@ -0,0 +1,4 @@
+lda #>{c1}
+pha
+lda #<{c1}
+pha
diff --git a/src/main/fragment/mos6502-common/_stackpushptr_=vwum1.asm b/src/main/fragment/mos6502-common/_stackpushptr_=vwum1.asm
new file mode 100644
index 000000000..63b51bce2
--- /dev/null
+++ b/src/main/fragment/mos6502-common/_stackpushptr_=vwum1.asm
@@ -0,0 +1,4 @@
+lda {m1}+1
+pha
+lda {m1}
+pha
diff --git a/src/main/fragment/mos6502-common/pbum1=_stackidxptr_vbuc1.asm b/src/main/fragment/mos6502-common/pbum1=_stackidxptr_vbuc1.asm
new file mode 100644
index 000000000..fb56042f3
--- /dev/null
+++ b/src/main/fragment/mos6502-common/pbum1=_stackidxptr_vbuc1.asm
@@ -0,0 +1,5 @@
+tsx
+lda STACK_BASE+{c1},x
+sta {m1}
+lda STACK_BASE+{c1}+1,x
+sta {m1}+1
diff --git a/src/main/java/dk/camelot64/kickc/model/ControlFlowGraph.java b/src/main/java/dk/camelot64/kickc/model/ControlFlowGraph.java
index f9d642720..886371380 100644
--- a/src/main/java/dk/camelot64/kickc/model/ControlFlowGraph.java
+++ b/src/main/java/dk/camelot64/kickc/model/ControlFlowGraph.java
@@ -141,7 +141,7 @@ public class ControlFlowGraph implements Serializable {
    public List<ControlFlowBlock> getEntryPointBlocks(Program program) {
       List<ControlFlowBlock> entryPointBlocks = new ArrayList<>();
       for(Procedure procedure : program.getScope().getAllProcedures(true)) {
-         if(Pass2ConstantIdentification.isAddressOfUsed(procedure.getRef(), program) || procedure.getCallingConvension().equals(Procedure.CallingConvension.STACK_CALL)) {
+         if(Pass2ConstantIdentification.isAddressOfUsed(procedure.getRef(), program) || Procedure.CallingConvension.STACK_CALL.equals(procedure.getCallingConvension())) {
             // Address-of is used on the procedure
             Label procedureLabel = procedure.getLabel();
             ControlFlowBlock procedureBlock = getBlock(procedureLabel.getRef());
diff --git a/src/main/java/dk/camelot64/kickc/model/types/SymbolTypeInference.java b/src/main/java/dk/camelot64/kickc/model/types/SymbolTypeInference.java
index bb416c71e..5887408d8 100644
--- a/src/main/java/dk/camelot64/kickc/model/types/SymbolTypeInference.java
+++ b/src/main/java/dk/camelot64/kickc/model/types/SymbolTypeInference.java
@@ -114,7 +114,7 @@ public class SymbolTypeInference {
       } else if(rValue instanceof ParamValue) {
          return inferType(symbols, ((ParamValue) rValue).getParameter());
       } else if(rValue instanceof StackIdxValue) {
-         return SymbolType.BYTE;
+         return ((StackIdxValue) rValue).getValueType();
       } else if(rValue instanceof MemsetValue) {
          return ((MemsetValue) rValue).getType();
       } else if(rValue instanceof MemcpyValue) {
diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass1AssertNoRecursion.java b/src/main/java/dk/camelot64/kickc/passes/Pass1AssertNoRecursion.java
index 85dc3da2e..b75229f90 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass1AssertNoRecursion.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass1AssertNoRecursion.java
@@ -21,7 +21,7 @@ public class Pass1AssertNoRecursion extends Pass1Base {
       Collection<Procedure> procedures = getScope().getAllProcedures(true);
       for(Procedure procedure : procedures) {
          Collection<ScopeRef> recursiveCalls = callGraph.getRecursiveCalls(procedure.getRef());
-         if(recursiveCalls.contains(procedure.getRef()) && !procedure.getCallingConvension().equals(Procedure.CallingConvension.STACK_CALL)) {
+         if(recursiveCalls.contains(procedure.getRef()) && !Procedure.CallingConvension.STACK_CALL.equals(procedure.getCallingConvension())) {
             throw new CompileError("ERROR! Recursion not allowed! Occurs in " + procedure.getRef());
          }
       }