Fix some issues from review #118030