Fix comments from Anders P