Fixed some minor import errors