Summer Fiesta 2023

Howdy, just a small patch with some Fiesta fixes. Grab it while it's hot!