Fix schema flaws found by working with