Clf and Admin fixes