Fixing bugs due to ArrayCollection Refactoring