Fixed comp issues - evin