More fixes, passes locally