[spyro] A handful of small improvements.