Minor fixes

Tests still running, but looking good:
http://build.syncthing.net/job/syncthing-integration/98/console