Review cern patches

Please review