Fix some design issues.