Fixes for items 2,3,4 for DSC-341