Fixed compile errors related to previous "Econ" commit.