Fixing small Bugs