More initializer tweaks