Removing a few bugs ...