Improve some build file parts.