Fixing all kind of problems, including build problems