Fixes on list