Merge fixes

Fixes and history view