MAP-252:  Fixes to Finish and Finish/Next button.