more infinite fixes