More tweaks for Release 37