Fixes to pass pylint 1.1.0