Some fixes

Broke some roms, but probably due to two wrongs making a right before.