Further improvements to final