Check in Lorenzo's init & return value fixes