Fix constructor and methods affected