More stability fixes. This code has been running on the dual xeon for
drwxr-xr-x - mono