Bug/concurrent target image3

Fixing this has pulled in some other changes/improvements to the plugins which I have broken out as distinct commits in this request.