Slight ASM improvements