M_Boats: Fix it and Sail...