Small changes to be ready for the new ListHashMap