Clean up some JSCS-triggered errors