Updates to fix non OTA Configuration