Corrected errors in construct.sql and populate.sql