Fix volunteer issues