Travis build fixes