Fixed some other stuff