Sail: Hotfix 1.17.1

Small fixes to issues with 1.17.0