Random fixes which I don't remember