Fixing Carl comments.