Fixed assembler errors