Minor startup fixes