More fixes for the Production Server (case-sensitivity)