Small fixes in Plugin class.