More fixes for PR #23.