Further omp tweaks