Fix a few more string memory issues.
Merge pull request #85 from glennw/c-str-issues

Fix a few more string memory issues.