Some more fixes for the disasm