update useing 1.5 compatibility fixes

same as 0001