Fix some bundle entries related issues