Fixed some constructors