List support - fixes