Fixed some old stuff ;)