Fix selection rendering and comments.