Minor improvements.
Minor bug fixes.