A few fixes wrt mkl