Plugin System: some little bugs cleared