Fixes for global bundle
Fixes for global bundle