Pundit errors

This was a short branch. Didn't even really *need* it.