Tweaks to pass JS Lint