Work around bugs in other plugins