Minor changes to constructors.