VE-1289: Address minor JSCS problems