upgrade a couple of utility classes to support arc