Fix some minor Design issues