fixes to 2.7