Some corrections and made MKL work on Edison