Small refinements, preparing for database driven permissions