Hi,
Greg, can you include these in the 5.4-stable batch for the next release? Lee reported and issue that really ended up being two separate bugs, I fixed these last week and Lee has tested them as good. No real upstream commits exists for these, as we fixed them separately with refactoring and cleanup of this code.