Fix initializers to match