3.6/ross fixes