Fixing Some Bugs