Sailfish: Fixes for #123