Saw boss fixes