Added missing import
Minor changes