VE-1460: Address jscs problems