More stack improvements