[c12493] Fix (at least) two false positive startup errors