Updates due to core utility changes.