small fixes
Merge branch 'OODT' of https://github.com/ccfapprn/network into OODT
Merge branch 'OODT'