Small corrections to setup.py and simplifications to some imports