[Reviewer: Matt] Fixes for crashes seen when running sprout under load

Matt, can you review these fixes for issues seen running sprout under load