Fix some JS

Change-Id: Id4ede14d003f5a1492eeef7e5f2a5a04163b2e9f