Updates to fix plugin issues.