Fix Extra Stuff