Some travis fixes