Unbroke the stuff I broke in 0.4.1