A couple morning fixes. Time to publish