bug fixes for new import