Issue #4294: Resolve bugs