pre-pr fixes