Merge pull request #101 from haberman/dwarf-form

Fixed a couple of compile warnings/errors.