Fixes for OTA updates