Fixup before database changes
New database structure