prod ready tweaks