ListMatch update, small fixes.