Fixes after PR comments