More fixes for the PR