Improvements on build process.