More fixes for issue #68.