Further changes to Volunteer and VolunteerForm