Fix Citadel to work nicely with Essentials