Fixed initialization in some constructors