fixes during pre-PR diff