More fixes, more and more