Fixed some more things