Try to make Travis happy based on Massimo's hints.