Various tweaks to match current production setup.