McGinn was a surprise substitute but the Aston Villa skipper came good in the end