Thursday morning fixes