Travis support tweaks