Fixes for PR comments.