Update for nightly 37 and friends

This is already pushed