3.6/ross dining fixes