2.8.1 minor changes