Do some little fixes.