Address jrick comments.