SHDP-310 Fixing warnings