Fixes on shema