Fix xqlint  & jshint warnings