Pick a couple build-related nits