Fixed some shit fucked up by other groups