Bugfixes (ArrayList)