Fix recent modifs in API