Part of the way fixed with Travis

gdit cvan