Activity update fixes