fixes for new import rules