More various updates.