some minor fixes, mostly on imports