Review fixes for PR #362