[spyro] A handful of minor improvements.