Bundle script fixes