Some production tweaks