Fixes after pull request annotations