13.02 fixes