Fixed compile errors created by introducing natural key sets.