VE-1321: Addressed some minor JSCS problems