Hopefully last in line of assembler fixes