[spyro] A few minor fixes and another 250 lines or so.