2.3.9 fixes and tweaks