Fix errors reported by Travis