Improve lapack compatibility (x86 and x86_64)