Fix all the stuff I broke in 067

I should refrain from releasing when over-tired

fixes #469