Made minor import changes