Fix deprecated &new constructors