Update 1.8 changes