VE-1342: Address JSCS problems