Fixes for boats project