Various fixes to setup.py and lmap