Tweaked files to pass JSLint