Plugin updates and various bugfixes