source 1.6 fixes