Changes to run on Travis