2. Tidy up build files to improve their consistency 3. Correct several (minor) build configuration errors