VE-1651: Addressed some JSCS problems