Department validation tweaks