Fix all usage of forEach