Fix object constructions.