tweaks after 2.5 prod update