More openmp fixes