Minor changes

Prepare to use OpenMP.