Fixed some more stuff...