Fixed some other things