Collection of minor build-time fixes