Update
Fix problems in the constructors