Fix startup issues.