Small fixes to ASM