More work getting Epiar to compile