Fix DB inserts