Fixed Other Stuff