#boatpilot - fixes