More updates on Boat NPCs, ref #1195