More hacks on getting the proper scripts