Fixed Broken Stuff