Fix some design minor issues