Add some Sunday morning fixes