Some comments fixes