Fix some stuff for 1.8