Fixed some referrences to static plugin variables to be of static type.