Fixing comments from Chris.