Hi Andrew, Both patches have been applied. I had to fix up a few things in order to make this actually work. Please review the changes and make sure they're OK with you. Thanks, -Denis