Fix constuctors