Correct a couple of issues with access groups