Fixing some bugs ...