Survival and Resto fixes