Quick fixes
Add schema converting util