Get igor common working again

minor fixes