Some more fixes for the BUNDLE Case