Fix various derps introduced in the last 12 hours