Fix the schema issues to actually work with the code...