Additional enhancements.
Minor bug fix.