Bug fixes for 2.6.4
Version 2.6.5