Fix changelog gen plus small fix