Added missing plugin entry point (second part)
Small fixes