More tweaks for cyclic security dependencies.