Fix issue with ControlBoat_Struct and OP_BoardBoat