Fixed up initialization of static variables