more fixes in schema