Fixed two little bugs - one in FIQ return, one in list handling.