more fixes for import export