fixed some errors due to bad imports