VE-1289: Address JSCS errors