more 5.0 tweaks