Fixes for SHDP-190 and SHDP-197