Fix the rest of the stuff broken in 1.7.8