Small tweaks to get the build to pass.

These things bother me :)

Looks like travis is back up, so if @karthik managed to get the switch flicked you should find out there if that works too.