More 2.0 tweaks