Adapting to CORRFW changes (Chiara)