Small fixes according to PR comments.