AMEND... fix schema minor problems