More changes to assembler