Some more bundle changes