Fix dependencies, upgrade plugins