Fixed some stuff with InfiStar