Address mpetazzoni comments.