Fixes a bunch of toList related issues.