Fix bugs.
merged