The fixes are needed right away so I'll merge in and someone please address this in a separate PR.