Further correcting borked schema