Fixing scripts