Fixed up constructors