Fixed some bugs in volunteer management