Further tweaks to build on Travis