Fix startup state