Fix errors introduced in last commit
Fix constructors calling parent implementation