Small fixes on schemas
Lot of small fixes