Plugin API 0.2.0: Cleanup + small fix