Fix future OTA problems