Minor changes to object pool and helper classes