Fix initializers