Fixed some more stuff.