Fixes after PR review