Tweaks to get plugin installable for 2.4