Added: List fixes