Changes to make Travis happy