Issue #379: Minor bug fixes/improvements.