more igor fixes