Sail: Blunderbuss Hotfix

We fixed some blunderbuss problems