Small tweaks for production