fixes for PR comments