Additional minor corrections for core as an ArrayList