Fix some boat calculations