Update 1.6 compatibility issues