nil fixes all over the place