More OTA support changes