Fix the constructors