fixes found testing 3.2->2.6