Fixed remaining review comments.