fixes to make geomach plugin structure work