Tent and gutting fixes