Fix plugin dependency issues