More fixes, still not working