Updates for Dec 12 patch