applying fixes from master
added missing build module