Makefile and asm_interpreter changes