April 15 would be the deadline for correcting an excess deferral to a qualified retirement plan. If an excess contribution was made to an IRA or HSA, the deadline is the filing deadline (including extension to October 16, 2017 if the 2016 tax return or a filing extension was timely filed).
