Minor fixes to lifeline #25