Fixes to get the plugin to compile under Linux