fix log blob length generation
fix merge/rebase
fix off by 2