various updates for 3.4.5 and beyond