Try to restore basic api functionality