Updates to run on Travis