FIx baseline calculation for lists, etc.