Some fixes, I don't remember