Fixed all of these instances I could find. Will continue to fix these if I come across any more.\