Fix import
Minor changes