fixed issues from assembler rename