release 3 fixes