Fixes for the ZAP plugin. Not sure how this ever worked.