Fixes for hunk history stuff