History activity fixes