Fixed some more stuff