Fix some design issues