Small fixes.
Merging.