dispenser fixes