Additional fixes for calculations using both parallel options activated.