Fixes and cleanup
Action history