Imporvement and fixes to build system.