Fix Some Stuff