OpenMP fixes