fixes+updates_for_2.6