Some script location changes