History and other fixes.