Travis and Jenkins build fixes