Fix PR #421 compile failures.