Multiple fixes on bundle dependencies