[BUG #5426] more schema refinements