corrections to work on uniserver