Minor build-time fixes