Few changes related to NA calculations.