Review fixes for PR #439