Slight bug fixes

Nothing important