Attached a patch for the files posted in the last message