Fix code errors + full life handling