Fixes for history