Final round of travis fixes