Fix edge cases during startup after power cycle