Fix some jslint/checkstyle warnings

Change-Id: Ic2a9d85229faeaaf141478b25317294fd5a29161