Update scripts that use new bundle library