Fix some minor design issues.