Small fixes
Merge branch 'dev' of https://github.com/chaot4/sea-crossing into dev