Updates for Sym2.4 compat