Tweak initialization list