VE-1537: Addressed all JSCS problems