some fixes from wsu branch