Issue #1: More bug fixes.