Fixed various small issues.