Fix dependency issue, work around potential issue with Travis