Some more fixes for undefined lists.