Plugin component: Small fixes