Credits and deductions

Following further investigation, I'd like to confirm that you added T4FHSA first. When you reach the "Amounts from Notice of Assessment or Reassessment" section, double-check that you've entered the correct amounts for each year.

I tried it using the information you provided, and the calculations were correct. I've attached a screenshot for reference.