Fix failed builds
Merge branch 'master' of github.com:NetCommons3/NetCommons3
Fix failed builds