some minor fixes
Merge branch 'dbsh' of https://github.com/smohsen91/net.ood into dbsh