Just some small fixes

Nothing to see here! Just some small bug fixes. Almost certainly didn't introduce a bunch of new bugs or accidentally break the whole game at the same time...