Fixed = vs -
More fixes