ECDR-48 Made minor code changes for Fortify scan issues marked as "High"