Plugin Fixes

Those fixes that TGMG helped me figure out, thank god this bug was resolved finally.