Asm2: Minor fixes