Fixed some more with exometer