final fixes for pentaho plugin.