Many fixes for production