Fixes for PR #3313 review