More fixes for SailfishOS version.