Fixes for pylint under jenkins