fixes in activity span