SQL error when updating items FOR 2.1

Here's the quick description:

Line 18 of item_codes_db.inc should probably read:

    $sql .= "item_code = ".db_escape($item_code)

rather than

    "item_code = ".db_escape($item_code)

This was causing sql error when updating items.

ALSO....
I think items_db.inc needed the same mod I made before but at line 24 ie.
update the call to update_item_code to include $category:

update_item_code(-1, $stock_id, $stock_id, $description,$category_id, 1, 0);

The calls to update_item_code and add_item_code in sales_kits.php look OK, although I haven't tested them.