More fixes lol