Minor changes developed by mppf designed to get the LLVM build working again