some class initializations changed