VE-1341: Address minor JSCS problems