fixes for API