Minor bugfixes mostly related to faulty plugins