Fix type calculations of +