Divers work fixes see BT#6418