Fixes for MKL data errors