Thursday aft work fixes