Minor tweaks in prep for Jenkins. And a fun typo fix as this is totally indented for production usage already :D