More Travis fixes, yet more to come