Fixing Some Stuff