Fixup deps and pep8 issues.