Fix Travis test failures