Additional tweaks for 3.0.0.3 update