misc. fixes

1. Fix clang-analyzer warning
2. Fix segfault
3. Add old-style hashes