Fix startup issues