Fixed up constructors.