Final Fixes for Allow Save Progress for go live