Deductions & credits

I was surprised that I found the maximum HSA contribution in 2019, was prorated for the year.

 

Background:  I reached age of 65 in late February.  I was enrolled in a High Deductable medical plan from 1/1/19 - 3/31/19 to cover my wife whom turned 65 in early April.  I went on Medicare effective 3/1/19, and my wife went on Medicare effective 4/1/19.   I made $4,000 contribution to my HSA account, prior to my 65th birthday.   My employer reported correctly that my contribution to HSA was $4,000.  Turbo Tax software advised me that I had an excess contribution of $2,000.   Apparently the max contribution was prorated to be $2,000, so I contributed too much.  So I replied to the software that I would withdraw the extra $2,000 by April 15th.

 

Two Questions:

1. Is the $2,000 limit for my circumstances detailed above accurate?

2. With the government filing deadline moved back three months, does that mean I can wait till the new deadline versus by 4/15/20, to withdraw the excess $2,000? 

Thanks in advance for answers.