Fix startup bug after last two blind commits.