Fixed Infuser bugs