[spyro] Assorted small improvements.