Fixing some errors that crept in and made e.g. remote03 to fail.
Fixing some errors that crept in and made e.g. remote03 to fail.

zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb