Do some fixes.