Replaced more ForIn statements
Updated builds