Fixes from PR#74