many components: minor fixes