Take two at fixing Fluid localizations and hopefully fixed bucket container item mixups