Fixed more stuff with new API