Fix for travis-ci broke build

I also made some little facelift tweaks...