Fixes for PR comments