More list number fixes