some fixes I did a while ago... I don't remember