Fix some issues with mnemonic handling