Minor fill-up location tweaks