Review fixes for PR #407