Various merge fixes and additional pep8 fixes