Travis test fixes, take 3