Trying to address some possible GC issues