Do some minor changes.