Fix FK names, references, collation