Fix Plugin Manager bugs