Tweaks for fab deployment of experimental plugin