Do some corrections