A small change to work around a GCC bug and some other updates so it builds on our cluster with Intel MKL.