Review fixes for PR #412