More fixes, but still not really working