Fixed more script errors