Latest two fixes (Collection)