Additional 3.0.9 tweaks