Some more changes for production