fixes in assembler