Fix some jshint complaints

Change-Id: I648c4817df521dc1ae02e0cd10d46ce32e9d292c