some fixes that I don't remember