Minor upgrade cleanup.