some small improvements to build