Fix some design bugs