Fix some schemas