General Fixes for production