Just resolve plugin dependencies

The other hacks don't seem to make a real difference