DS-1554 fix and related preventive fixes