Comments components: minor fixes;