History fixes
More history changes