2.6 minor changes