Some boat tweaking