Changes in the build behaviour