more fixes cause this sucks