Small fixes

Have been reviewed, merged and running on Nemo  / Sailfish for some time now.