Misc tweaks

Reopening and trying to figure out Travis CI