Fix all the crap I probably broke in 1.4.0 ;)
