More JSCS fixes; down to 295 failures