Few tweaks to build process