bug fixes for import and supply