Fix construction objects