Production branch tweaks