Fix assembler bugs