update using 1.5 compatibility fixes

same as 0001 and 0002