More fixes, I can do it