More fixes, no luck