Changes to handle Bundle comparisons better