Fixing issues for PR 2192