Further efforts to fix bundle changes