More schema hardening

Merged
JV
3mo ago
+294-123

Signed-off-by: Juan Cruz Viotti jv@jviotti.com