Fixes for buildbot (whitespace, unused imports etc.).