Fixes And Stuff