Reverting mediation feature removal
Fixing CC starting up issues