User activity fixes