Make bundle script more portable