Fix couple bugs introduced in refactoring for Travis.