Enterprise 1.13 fixes