Try attached file, both problems should be solved with this patched unit (just replace a file and rebuild a project).
Hi Serge:
Thank you very much for addressing this for us. I have downloaded and re-installed using the new .pas file. My initial tests all look promising. We will be testing over the next few days. If there are any problems found, we will post them here.