Global shift/scale more properly handled