Changed plugin references to final