Fix small bugs for uos env