release 4 fixes