Do some final corrections