More stack changes