Fixing Some Stuff.