Making some stuff look nicer in samples.