Fix Some Bugging