Fix some issues discovered when assembling some legacy assembler source