Cleaned a little bit the build.