fixes in Array Comprehensions in ES6