DSC-850 fixes