Fixes to Boat Spawning