Update few bugs.