Plugin management: Small fixes