Update activity fixes