fix a few imports