Bug fixes for 2.6