[sailfish] v0.4.x fixes

See commits for details.

I didn't open a pull request against `v0.5.x` as I expect you to regularly merge `master` into it.