13.03 fixes