fixes for import