Fixed some more shit