Fix travis build for latest changes