Fix GPS and Temporary fix DeviceSettings