PR morning fixes