Some Mac build fixes. Still need to find the installed plugin version in Twiddly.