Checking in fixes I've made in the past 30 minutes. I'm tired now. So I'm going to bed.