bug fixes as we didn't set `display_style` in these code-paths