Changes to try and make Travis happy