Fix constructor signature. Fix syntax errors.