Fix lint issues

These are only shown when pylint is executed under python 2.7