Fixes reviewer comments.