Some more fixes to ensure +initialize_statics has been called (once)