Final fixes for 1.0 PROD