Fixed some other things
More fixes