Numbered lists fixes