OpenMP-related fixes