More fixes, missed some requires