Various bug fixes

git-svn-id: https://plugins.svn.wordpress.org/church-admin/trunk@975220 b8457f37-d9ea-0310-8a92-e5e31aec5664