Fixes for PR review comments from Dan.