Fix the ASM issues