Updates and bugfixes in plugin scripts