Fixed some old, incorrect stuff