Fixes for bundle. Now in UMD