related work fixes