Changes to handle update to Sailfish 1.0.7