Small changes to assist granular admin mods