More JSCS fixes

![1414497531_little_girls_fairy_flies_directly_into_fireplace](https://cloud.githubusercontent.com/assets/74132/4816959/4e449cf2-5ee4-11e4-888b-e999fba96815.gif)