Schema ugliness fixes