fix some warnings
Merge branch 'jenkins_buildout'