[spyro] A few minor touchups.