Do some corrections;