Feb 3 fixes