Small fixes for survival