a bunch of sailfish fixes