Fix openmp (squash with refactor)