Bug fix in grow function and race fix in dispatcher