Incoming travis fixes