Fixed some more errors in Calculation Block.