Fix constructor types