first startup fixes