Fix a couple of NPEs relating to stringifying Fluids