Do some minor fixes.