Fix various small issues.