Various fixes for API category changes: