Access and template fixes

Hi ddean-

Here's a branch that incorporates @r-a-y 's fixes and also what's needed to allow the new group access system in BP2.1+ to work. Again, there was a conflict to manually resolve, so I'm sharing the branch with you for your convenience in checking out the changes.

Thanks!

-David