Do some minor minor fixes.