Updating few bugs