More fixes, still crashes.