More life fixes