Fix some issues after pull-request review.