updates for R16 compat