Updates for changeset24.sql