My apologies -- one of the fixes was not present in last upload.
It is now.

More...