more fixes for API Import