some fixes i can't remember