Fix startup errors